auto merge of #534 : alexcrichton/cargo/issue-525, r=brson
authorbors <bors@rust-lang.org>
Tue, 9 Sep 2014 19:43:46 +0000 (19:43 +0000)
committerbors <bors@rust-lang.org>
Tue, 9 Sep 2014 19:43:46 +0000 (19:43 +0000)
commit5c55068218aa51a1af57c0d23948493d938467d0
tree83b09318f80f578223aa36c5d13bb195aff0b3f4
parent50976aa23be4c9023d7eb980565253040b27d157
parent5aa3b38185e30fe5793b237fb82036a4317cf8b4
auto merge of #534 : alexcrichton/cargo/issue-525, r=brson

Closes #525

r? @wycats